Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Thu, 23 May 2013 13:23:32 +0000 (14:23 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Thu, 23 May 2013 13:23:32 +0000 (14:23 +0100)
commitda3bca931fbcf0cbdfec971aca234e7ec0f41e16
tree3e69e88df0c9187252a45575a75b7a55ec8aaed5
parent7312c21dbd3f5026f087ba72c4e36754f1921762
parent47f71a8ccb0c881cf3d9e0b917ef5f0dc084b062
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging